bitkeeper revision 1.1250 (42388967abs8cSqOtVzsPvhEiltK5Q)

fixed manual merge error

Signed-off-by: michael.fetterman@cl.cam.ac.uk

diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h
index 7cb895e9fc13cb832010d4a5a1343c272fb0e3ad..4ae9f09f08586ddab15613ed98b74573bd6050ba 100644 (file)
--- a/xen/include/asm-x86/mm.h
+++ b/xen/include/asm-x86/mm.h
@@ -129,8 +129,6 @@ static inline u32 pickle_domptr(struct domain *domain)
 #define page_get_owner(_p)    (unpickle_domptr((_p)->u.inuse._domain))
 #define page_set_owner(_p,_d) ((_p)->u.inuse._domain = pickle_domptr(_d))
 
-#define page_out_of_sync(_p)  ((_p)->count_info & PGC_out_of_sync)
-
 #define SHARE_PFN_WITH_DOMAIN(_pfn, _dom)                                   \
     do {                                                                    \
         page_set_owner((_pfn), (_dom));                                     \
@@ -235,22 +233,6 @@ static inline int get_page_and_type(struct pfn_info *page,
     return rc;
 }
 
-static inline int mfn_is_page_table(unsigned long mfn)
-{
-    if ( !pfn_is_ram(mfn) )
-        return 0;
-
-    return frame_table[mfn].count_info & PGC_page_table;
-}
-
-static inline int page_is_page_table(struct pfn_info *page)
-{
-    if ( !pfn_is_ram(page_to_pfn(page)) )
-        return 0;
-
-    return page->count_info & PGC_page_table;
-}
-
 #define ASSERT_PAGE_IS_TYPE(_p, _t)                            \
     ASSERT(((_p)->u.inuse.type_info & PGT_type_mask) == (_t)); \
     ASSERT(((_p)->u.inuse.type_info & PGT_count_mask) != 0)

diff --git a/xen/include/xen/perfc_defn.h b/xen/include/xen/perfc_defn.h
index e2f6850e15e7da4fa37596984782f5222241aa91..930528081ffcc374484f56ac643ebd678b5ebee1 100644 (file)
--- a/xen/include/xen/perfc_defn.h
+++ b/xen/include/xen/perfc_defn.h
@@ -83,3 +83,4 @@ PERFCOUNTER_CPU(validate_pte_calls,                "calls to validate_pte_change
 PERFCOUNTER_CPU(validate_pte_changes,              "validate_pte makes changes")
 PERFCOUNTER_CPU(validate_pde_calls,                "calls to validate_pde_change")
 PERFCOUNTER_CPU(validate_pde_changes,              "validate_pde makes changes")
+PERFCOUNTER_CPU(shadow_get_page_fail,   "shadow_get_page_from_l1e fails" )